Merge git://git.denx.de/u-boot-rockchip
authorTom Rini <[email protected]>
Fri, 15 Jan 2016 13:11:15 +0000 (08:11 -0500)
committerTom Rini <[email protected]>
Fri, 15 Jan 2016 13:11:15 +0000 (08:11 -0500)

Trivial merge